Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 23:01:38 +0000 (23:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 14 Jan 2010 23:01:38 +0000 (23:01 +0000)
commit32d4b4c67ac199ef88223168e3ad97ed91e4efde
tree8e52f8181ae16084e0cd0ab3d4f3be02d79c5ea4
parentd32245c7a981f7ab0169c1c845d12811322ff7fa
parentb8209728de1450db55b5fdc1a2cd084dc51a1e3d
Merge from mainline.